From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 4 Sep 2012 18:46:38 +0000 (-0700)
Subject: Merge branch 'staging-linus' into staging-next
X-Git-Tag: archive/raspbian/4.9.13-1+rpi1~10^2~10294^2~817
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=4d480efacee65eba9b6301dd02d679458d5ce447;p=linux-4.9.git

Merge branch 'staging-linus' into staging-next

This gets the 6 staging comedi patches that are needed for further
patches that Ian sent.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

4d480efacee65eba9b6301dd02d679458d5ce447